Skip to content

fix kops job generator #35878

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix kops job generator #35878

wants to merge 1 commit into from
+115,335 −8,207

Conversation

@upodroid
Copy link
Member

@upodroid upodroid commented Nov 6, 2025

Busy PR, but it does the following:

  • drops kubernetes 1.31 jobs
  • drops kops 1.31 and older
  • adds kops 1.33 and 1.34 jobs
  • I removed duplicate jobs from the misc board, as they exist elsewhere
  • unified the distro lists so we should have every os combination configured correctly
  • add kindnet as a cni option

I'll fix up the upgrade jobs in a separate PR

@k8s-ci-robot k8s-ci-robot added cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. area/config Issues or PRs related to code in /config size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. area/jobs labels Nov 6, 2025
@k8s-ci-robot k8s-ci-robot added area/testgrid sig/cluster-lifecycle Categorizes an issue or PR as relevant to SIG Cluster Lifecycle. sig/testing Categorizes an issue or PR as relevant to SIG Testing. approved Indicates a PR has been approved by an approver from all required OWNERS files. labels Nov 6, 2025
@upodroid upodroid force-pushed the kops-job-fixes branch 3 times, most recently from 756053d to 60d3be2 Compare November 6, 2025 15:12
justinsb
justinsb reviewed Nov 6, 2025
View reviewed changes
config/jobs/kubernetes/kops/build_jobs.py Outdated
for k8s_version in k8s_versions:
for kops_version in [None]: # TODO: all kops_versions:
for kops_version in kops_versions:
distro_short = distro.replace('ubuntu', 'u').replace('debian', 'deb').replace('amazonlinux', 'amzn')
Copy link
Member

@justinsb justinsb Nov 6, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I assume this is because we get names that are too long otherwise (for use as cluster names?)

Copy link
Member Author

@upodroid upodroid Nov 6, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, it's currently like that for the AWS jobs.

ameukam
ameukam reviewed Nov 8, 2025
View reviewed changes
config/jobs/kubernetes/kops/build_jobs.py
def generate_misc():
results = [
# A one-off scenario testing the k8s.gcr.io mirror
build_test(name_override="kops-scenario-gcr-mirror",
Copy link
Member

@ameukam ameukam Nov 8, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Let's keep this test. The failure here is intentional. The comment is misleading.

Copy link
Member Author

@upodroid upodroid Nov 25, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is a duplicate of https://testgrid.k8s.io/kops-network-plugins#kops-aws-cni-cilium and https://testgrid.k8s.io/kops-distro-u2404#kops-grid-cilium-u2404-k34 and more

@k8s-ci-robot k8s-ci-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Nov 13, 2025
@k8s-ci-robot k8s-ci-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Nov 25, 2025
hakman
hakman reviewed Dec 1, 2025
View reviewed changes
config/jobs/kubernetes/kops/kops-periodics-distros.yaml
testgrid-dashboards: kops-distro-u2204, kops-distros, kops-k8s-stable, kops-latest, sig-cluster-lifecycle-kops
testgrid-days-of-results: '90'
testgrid-tab-name: kops-aws-distro-ubuntu2204arm64
testgrid-tab-name: kops-aws-distro-u2204arm64
Copy link
Member

@hakman hakman Dec 1, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

is it expected to change the testgrid-tab-name ?

Copy link
Member Author

@upodroid upodroid Dec 1, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, it now becomes the shortname https://testgrid.k8s.io/kops-distros

Copy link
Member

@hakman hakman Dec 1, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

any special reason?

Copy link
Member Author

@upodroid upodroid Dec 1, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We are using the same standardised function used by kops-grid

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Dec 1, 2025
@k8s-ci-robot
Copy link
Contributor

k8s-ci-robot commented Dec 1, 2025

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: hakman, upodroid

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@k8s-ci-robot k8s-ci-robot removed the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Dec 1, 2025
@k8s-ci-robot
Copy link
Contributor

k8s-ci-robot commented Dec 1, 2025

New changes are detected. LGTM label has been removed.

@k8s-ci-robot
Copy link
Contributor

k8s-ci-robot commented Dec 1, 2025

@upodroid: The following test failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name Commit Details Required Rerun command
pull-test-infra-unit-test 5162f2b link true /test pull-test-infra-unit-test

Full PR test history. Your PR dashboard. Please help us cut down on flakes by linking to an open issue when you hit one in your PR.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository. I understand the commands that are listed here.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@ameukam ameukam ameukam left review comments

@johngmyers johngmyers Awaiting requested review from johngmyers

@zetaab zetaab Awaiting requested review from zetaab

+2 more reviewers

@justinsb justinsb justinsb left review comments

@hakman hakman hakman approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

@hakman hakman

Labels

approved Indicates a PR has been approved by an approver from all required OWNERS files. area/config Issues or PRs related to code in /config area/jobs area/testgrid cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. sig/cluster-lifecycle Categorizes an issue or PR as relevant to SIG Cluster Lifecycle. sig/testing Categorizes an issue or PR as relevant to SIG Testing. size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

5 participants

@upodroid @k8s-ci-robot @justinsb @ameukam @hakman